testsuite: Test gtk4-builder-tool simplify --replace

Run all gtk4-builder-tool test with and without --replace.
This improves test coverage for gtk4-builder-tool

diff --git a/testsuite/tools/simplify-3to4.in b/testsuite/tools/simplify-3to4.in
index 31d7da09709744302691e1d3126fdefca049a852..35b8a8272f64c6aa508ab1b680971c33211327ac 100755 (executable)
--- a/testsuite/tools/simplify-3to4.in
+++ b/testsuite/tools/simplify-3to4.in
@@ -7,13 +7,14 @@ TEST_RESULT_DIR=${TEST_RESULT_DIR:-/tmp}
 shopt -s nullglob
 TESTS=( "$TEST_DATA_DIR"/*.ui )
 
-echo "1..${#TESTS[*]}"
+echo "1..$((2 * ${#TESTS[*]}))"
 
 I=1
 for t in ${TESTS[*]}; do
   name=$(basename $t .ui)
   expected="$TEST_DATA_DIR/$name.expected"
   result="$TEST_RESULT_DIR/$name.out"
+  result2="$TEST_RESULT_DIR/$name.out2"
   diff="$TEST_RESULT_DIR/$name.diff"
   ref="$TEST_RESULT_DIR/$name.ref"
 
@@ -28,4 +29,17 @@ for t in ${TESTS[*]}; do
   fi
 
   I=$((I+1))
+
+  cp $t $result2
+  $GTK_BUILDER_TOOL simplify --3to4 --replace $result2 2>/dev/null
+
+  if diff -u "$expected" "$result2" > "$diff"; then
+    echo "ok $I $name (--replace)"
+    rm "$diff"
+  else
+    echo "not ok $I $name (--replace)"
+    cp "$expected" "$ref"
+  fi
+
+  I=$((I+1))
 done

diff --git a/testsuite/tools/simplify.in b/testsuite/tools/simplify.in
index c92c5c6d9c67f962b1c7425ec0bc762c67c01989..e90437337b481e98c059aa1f1c5fb2e44651eeae 100755 (executable)
--- a/testsuite/tools/simplify.in
+++ b/testsuite/tools/simplify.in
@@ -7,13 +7,14 @@ TEST_RESULT_DIR=${TEST_RESULT_DIR:-/tmp}
 shopt -s nullglob
 TESTS=( "$TEST_DATA_DIR"/*.ui )
 
-echo "1..${#TESTS[*]}"
+echo "1..$((2 * ${#TESTS[*]}))"
 
 I=1
 for t in ${TESTS[*]}; do
   name=$(basename $t .ui)
   expected="$TEST_DATA_DIR/$name.expected"
   result="$TEST_RESULT_DIR/$name.out"
+  result2="$TEST_RESULT_DIR/$name.out2"
   diff="$TEST_RESULT_DIR/$name.diff"
   ref="$TEST_RESULT_DIR/$name.ref"
 
@@ -28,4 +29,17 @@ for t in ${TESTS[*]}; do
   fi
 
   I=$((I+1))
+
+  cp $t $result2
+  $GTK_BUILDER_TOOL simplify --replace $result2 2>/dev/null
+
+  if diff -u "$expected" "$result2" > "$diff"; then
+    echo "ok $I $name (--replace)"
+    rm "$diff"
+  else
+    echo "not ok $I $name (--replace)"
+    cp "$expected" "$ref"
+  fi
+
+  I=$((I+1))
 done